Merge branch 'master' of git://git.denx.de/u-boot-tegra
authorTom Rini <[email protected]>
Tue, 27 Sep 2016 16:47:25 +0000 (12:47 -0400)
committerTom Rini <[email protected]>
Tue, 27 Sep 2016 16:47:25 +0000 (12:47 -0400)

Trivial merge